From: Katsumi Yamaoka <katsumi@flagship2>
Date: Fri, 23 Apr 2010 22:30:27 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7151^2~75
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3554f3d0043b64ae5774dc494ca00b9c4c2b68b2;p=emacs.git

Merge from mainline.
---

3554f3d0043b64ae5774dc494ca00b9c4c2b68b2